Autogenerated HTML docs for v2.23.0-526-g70bf0
diff --git a/git-diff-files.html b/git-diff-files.html index b718da6..e82f225 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -2293,13 +2293,17 @@ </div> </div> <div class="sect1"> -<h2 id="_generating_patches_with_p">Generating patches with -p</h2> +<h2 id="_generating_patch_text_with_p">Generating patch text with -p</h2> <div class="sectionbody"> -<div class="paragraph"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run -with a <code>-p</code> option, "git diff" without the <code>--raw</code> option, or -"git log" with the "-p" option, they -do not produce the output described above; instead they produce a -patch file. You can customize the creation of such patches via the +<div class="paragraph"><p>Running +<a href="git-diff.html">git-diff(1)</a>, +<a href="git-log.html">git-log(1)</a>, +<a href="git-show.html">git-show(1)</a>, +<a href="git-diff-index.html">git-diff-index(1)</a>, +<a href="git-diff-tree.html">git-diff-tree(1)</a>, or +<a href="git-diff-files.html">git-diff-files(1)</a> +with the <code>-p</code> option produces patch text. +You can customize the creation of patch text via the <code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div> <div class="paragraph"><p>What the -p option produces is slightly different from the traditional diff format:</p></div> @@ -2346,7 +2350,7 @@ similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one.</p></div> -<div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change. +<div class="paragraph"><p>The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.</p></div> </li> @@ -2378,7 +2382,7 @@ </div> </div> <div class="sect1"> -<h2 id="_combined_diff_format">combined diff format</h2> +<h2 id="_combined_diff_format">Combined diff format</h2> <div class="sectionbody"> <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default @@ -2386,7 +2390,7 @@ <a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any of these commands to force generation of diffs with individual parents of a merge.</p></div> -<div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div> +<div class="paragraph"><p>A "combined diff" format looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><code>diff --combined describe.c @@ -2421,13 +2425,13 @@ <li> <p> It is preceded with a "git diff" header, that looks like - this (when <code>-c</code> option is used): + this (when the <code>-c</code> option is used): </p> <div class="literalblock"> <div class="content"> <pre><code>diff --combined file</code></pre> </div></div> -<div class="paragraph"><p>or like this (when <code>--cc</code> option is used):</p></div> +<div class="paragraph"><p>or like this (when the <code>--cc</code> option is used):</p></div> <div class="literalblock"> <div class="content"> <pre><code>diff --cc file</code></pre> @@ -2482,7 +2486,7 @@ Chunk header format is modified to prevent people from accidentally feeding it to <code>patch -p1</code>. Combined diff format was created for review of merge commit changes, and was not - meant for apply. The change is similar to the change in the + meant to be applied. The change is similar to the change in the extended <em>index</em> header: </p> <div class="literalblock">
